40c8a96b9647f789fe37e71671269eff7d9c7915,portal-impl/src/com/liferay/portal/tools/SourceFormatter.java,SourceFormatter,_getJavaTermTuple,#String#,2267
Before Change
if (line.endsWith(StringPool.SEMICOLON) ||
line.contains(StringPool.EQUAL)) {
String variableName = _getVariableName(line);
if (Character.isLowerCase(variableName.charAt(0))) {
return null;
}
return new Tuple(variableName, _TYPE_VARIABLE_PROTECTED_STATIC);
}
if (pos != -1) {
After Change
private static Tuple _getJavaTermTuple(String line) {
int pos = line.indexOf(StringPool.OPEN_PARENTHESIS);
if (line.startsWith(StringPool.TAB + "public static final ") &&
(line.endsWith(StringPool.SEMICOLON) ||
line.contains(StringPool.EQUAL))) {
return new Tuple(
_getVariableName(line), _TYPE_VARIABLE_PUBLIC_STATIC_FINAL);
}
else if (line.startsWith(StringPool.TAB + "public static ")) {
if (line.endsWith(StringPool.SEMICOLON) ||
line.contains(StringPool.EQUAL)) {
return new Tuple(
_getVariableName(line), _TYPE_VARIABLE_PUBLIC_STATIC);
}
if (pos != -1) {
return new Tuple(
_getConstructorOrMethodName(line, pos),
_TYPE_METHOD_PUBLIC_STATIC);
}
if (line.startsWith(StringPool.TAB + "public static class ")) {
return new Tuple(
_getClassName(line), _TYPE_CLASS_PUBLIC_STATIC);
}
}
else if (line.startsWith(StringPool.TAB + "public ")) {
if (line.contains(StringPool.EQUAL) ||
(line.endsWith(StringPool.SEMICOLON) &&
!line.contains(StringPool.OPEN_PARENTHESIS))) {
return new Tuple(_getVariableName(line), _TYPE_VARIABLE_PUBLIC);
}
if (pos != -1) {
int spaceCount = StringUtil.count(
line.substring(0, pos), StringPool.SPACE);
if (spaceCount == 1) {
return new Tuple(
_getConstructorOrMethodName(line, pos),
_TYPE_CONSTRUCTOR_PUBLIC);
}
if (spaceCount > 1) {
return new Tuple(
_getConstructorOrMethodName(line, pos),
_TYPE_METHOD_PUBLIC);
}
}
else if (line.startsWith(StringPool.TAB + "public class ")) {
return new Tuple(_getClassName(line), _TYPE_CLASS_PUBLIC);
}
}
else if (line.startsWith(StringPool.TAB + "protected static final ")) {
if (line.endsWith(StringPool.SEMICOLON) ||
line.contains(StringPool.EQUAL)) {
return new Tuple(
_getVariableName(line),
_TYPE_VARIABLE_PROTECTED_STATIC_FINAL);
}
}
else if (line.startsWith(StringPool.TAB + "protected static ")) {
if (line.endsWith(StringPool.SEMICOLON) ||
line.contains(StringPool.EQUAL)) {
return new Tuple(
_getVariableName(line), _TYPE_VARIABLE_PROTECTED_STATIC);
}
if (pos != -1) {
return new Tuple(
_getConstructorOrMethodName(line, pos),
_TYPE_METHOD_PROTECTED_STATIC);
}
}
else if (line.startsWith(StringPool.TAB + "protected ")) {
if ((pos != -1) && !line.contains(StringPool.EQUAL)) {
int spaceCount = StringUtil.count(
line.substring(0, pos), StringPool.SPACE);
if (spaceCount == 1) {
return new Tuple(
_getConstructorOrMethodName(line, pos),
_TYPE_CONSTRUCTOR_PROTECTED);
}
if (spaceCount > 1) {
return new Tuple(
_getConstructorOrMethodName(line, pos),
_TYPE_METHOD_PROTECTED);
}
}
return new Tuple(_getVariableName(line), _TYPE_VARIABLE_PROTECTED);
}
else if (line.startsWith(StringPool.TAB + "private static final ")) {
if (line.endsWith(StringPool.SEMICOLON) ||
line.contains(StringPool.EQUAL)) {
return new Tuple(
_getVariableName(line),
_TYPE_VARIABLE_PRIVATE_STATIC_FINAL);
}
}
else if (line.startsWith(StringPool.TAB + "private static ")) {
if (line.endsWith(StringPool.SEMICOLON) ||
line.contains(StringPool.EQUAL)) {
return new Tuple(
_getVariableName(line), _TYPE_VARIABLE_PRIVATE_STATIC);